Merged.
authoremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:30:51 +0000 (11:30 +0100)
committeremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:30:51 +0000 (11:30 +0100)
commite9b1a2dcabae40491e2a62de33ffd4519715b017
tree10281a320cd451fbdbfc4aafe407b257618c1505
parent6edcc99481153a6aad39a7dd098264244d8d8f48
Merged.

Signed-off-by: Ewan Mellor <ewan@xensource.com>